Don't leak preedit_string and preedit_attrs. (#322332, Paolo Borelli)

2006-01-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't
	leak preedit_string and preedit_attrs.  (#322332, Paolo
	Borelli)

diff --git a/ChangeLog b/ChangeLog
index b42283bb20744bec4b1e13c73e792fbdbc094296..057f8d070f07b333cfd738d25776ee187ba2026f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-01-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't
+       leak preedit_string and preedit_attrs.  (#322332, Paolo
+       Borelli)
+
        * gtk/gtk.symbols:
        * gtk/gtkaction.h: 
        * gtk/gtkaction.c (gtk_widget_get_action): New function to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b42283bb20744bec4b1e13c73e792fbdbc094296..057f8d070f07b333cfd738d25776ee187ba2026f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-01-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktextlayout.c (gtk_text_layout_finalize): Don't
+       leak preedit_string and preedit_attrs.  (#322332, Paolo
+       Borelli)
+
        * gtk/gtk.symbols:
        * gtk/gtkaction.h: 
        * gtk/gtkaction.c (gtk_widget_get_action): New function to

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index a73533fe6e7ee7003ec33c59656ae3cc593e1efa..b46d1685bad1c460da1a9893cdc33401d876c163 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -297,6 +297,19 @@ gtk_text_layout_finalize (GObject *object)
       gtk_text_layout_free_line_display (layout, tmp_display);
     }
 
+  if (layout->preedit_string)
+    {
+      g_free (layout->preedit_string);
+      layout->preedit_string = NULL;
+    }
+
+  if (layout->preedit_attrs)
+    {
+      pango_attr_list_unref (layout->preedit_attrs);
+      layout->preedit_attrs = NULL;
+    }
+
+
   (* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }